Rob Browning [Sun, 18 Oct 2015 17:03:08 +0000 (12:03 -0500)]
Add upstream StartupWMClass/Keywords to *.desktop
Copy them from the upstream etc/emacs.desktop.
Rob Browning [Sun, 18 Oct 2015 16:55:32 +0000 (11:55 -0500)]
Split desktop file into term and non-term versions
Thanks to Norbert Preining <preining@logic.at> for reporting the
problem.
Closes: 799935
Rob Browning [Sun, 18 Oct 2015 16:14:24 +0000 (11:14 -0500)]
Adjust debian/changelog for UNRELEASED 24.5+1-3 development
Rob Browning [Sat, 19 Sep 2015 19:51:10 +0000 (14:51 -0500)]
Update debian/changelog for 24.5+1-2 release
Rob Browning [Sat, 19 Sep 2015 19:47:57 +0000 (14:47 -0500)]
Don't hang during large yanks
Add 0009-Emacs-should-no-longer-hang-during-large-yanks.patch to
incorporate the relevant upstream patch. Thanks to Mike Crowe
<mac@mcrowe.com> for reporting the problem and tracking down the fix.
Closes: 795909
Paul Eggert [Fri, 17 Jul 2015 18:54:24 +0000 (11:54 -0700)]
Emacs should no longer hang during large yanks
This upstream patch has been added:
Fix hang with large yanks
Backport of master commit
0592cefd03f1de2f04b721d07a16e6e0a9e48f73.
This should fix the bug fixed by Mike Crowe's patch in:
https://lists.gnu.org/archive/html/emacs-devel/2015-07/msg00106.html
A problem in this area has been reported by several users; see
Bug#16737, Bug#17101, Bug#17026, Bug#17172, Bug#19320, Bug#20283.
This fix differs from Mike Crowe's patch in that it should avoid a
race condition that could lose SIGIO signals. ignore_sigio dates
back to the 1980s when some platforms couldn't block signals, and
could only ignore them, which led to races when signals arrived
while being ignored. We shouldn't have to worry about those old
platforms now.
* src/dispextern.h, src/sysdep.c (ignore_sigio): Remove.
* src/emacs.c (shut_down_emacs):
Don't call ignore_sigio; unrequest_sigio should suffice.
* src/keyboard.c (kbd_buffer_store_buffered_event):
Use unrequest_sigio, not ignore_sigio.
(kbd_buffer_get_event):
Call request_sigio when getting the ball rolling again.
Origin: upstream, commit:
a27ae9d7650a1230d4359eaf0a949f827315a6d2
Bug: http://debbugs.gnu.org/16737
Bug-Debian: http://bugs.debian.org/795909
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 19 Sep 2015 19:46:40 +0000 (14:46 -0500)]
Don't assume grep supports GREP_OPTIONS
Add 0008-Emacs-won-t-assume-grep-supports-GREP_OPTIONS.patch to
incorporate the relevant upstream patch. Thanks to Bob Proulx
<bob@proulx.com> for reporting the problem, and Ben Finney
<ben+debian@benfinney.id.au> for tracking down the fix.
Closes: 793741
Paul Eggert [Wed, 17 Sep 2014 00:07:12 +0000 (17:07 -0700)]
Emacs won't assume grep supports GREP_OPTIONS
This upstream patch has been added:
Don't assume 'grep' supports GREP_OPTIONS.
The GREP_OPTIONS environment variable is planned to be marked
obsolescent in GNU grep, due to problems in its use, so stop
relying on it.
* progmodes/grep.el (grep-highlight-matches): Document this.
(grep-process-setup): Do not set GREP_OPTIONS.
(grep-compute-defaults): Use an explicit --color option if supported.
Origin: upstream, commit:
2e4c2fe2787785a421f256541de642976e9bd90b
Bug: http://debbugs.gnu.org/19247
Bug-Debian: http://bugs.debian.org/793741
Added-by: Rob Browning <rlb@defaultvalue.org>
David Bremner [Sat, 10 Jan 2015 22:23:46 +0000 (23:23 +0100)]
Explicity specify QUILT_PATCHES_PREFIX in rules
The current use relies on the names of patches being prefixed with
debian/patches, which doesn't seem to be completely reliable (e.g. it
doesn't happen in a wheezy build environment). The environment
variable QUILT_PATCHES_PREFIX is documented to do this.
Closes: 775068
Rob Browning [Sat, 5 Sep 2015 17:55:26 +0000 (12:55 -0500)]
Update .desktop file and add terminal flavor
Rob Browning [Sat, 5 Sep 2015 17:55:03 +0000 (12:55 -0500)]
Remove .menu file as per TC resolution of #741573
Martin Račák [Thu, 17 Sep 2015 18:30:39 +0000 (20:30 +0200)]
emacsVER.desktop: don't use absolute path to icon
Closes: 778884
Rob Browning [Sat, 19 Sep 2015 17:27:19 +0000 (12:27 -0500)]
Adjust debian/changelog for UNRELEASED 24.5+1-2 development
Rob Browning [Wed, 17 Jun 2015 05:12:40 +0000 (00:12 -0500)]
Update debian/changelog for 24.5+1-1 release
Rob Browning [Sun, 14 Jun 2015 20:40:13 +0000 (15:40 -0500)]
Update debian/copyright* for 24.5
Rob Browning [Sun, 14 Jun 2015 20:03:01 +0000 (15:03 -0500)]
Merge upstream version 24.5
Remove redundant patches:
0008-A-race-to-create-info-has-been-eliminated.patch
0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch
Rob Browning [Wed, 22 Oct 2014 00:10:17 +0000 (19:10 -0500)]
Don't try to build src/macuvs.h (via IVD_Sequences.txt)
These are OS X specific, and were removed for now, due to uncertainty
over the licensing.
Rob Browning [Tue, 5 Apr 2011 03:46:29 +0000 (22:46 -0500)]
Look for NEWS in order to find etc/ rather than GNU.
Emacs will now look for NEWS in order to find etc/ rather than GNU.
Since Debian doesn't include GNU in the Debian packages (the common
licenses are in /usr/share/common-licenses), Emacs will now look for
NEWS to find the etc directory instead of GNU.
Provided-by: Sven Joachim <svenjoac@gmx.de>
Originally-reported-by: Bernhard Michler <Boregard@gmx.net>
Date: Mon, 28 Apr 2008 11:20:23 +0200
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: Debian specific
Rob Browning [Tue, 5 Apr 2011 03:46:28 +0000 (22:46 -0500)]
Modify the output of (version) to indicate Debian modifications.
The output of (version) has been modified to indicate Debian modifications.
Author: Rob Browning <rlb@defaultvalue.org>
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Tue, 5 Apr 2011 03:46:25 +0000 (22:46 -0500)]
Adjust documentation references for Debian.
Various documentation references have been adjusted for Debian.
References to /usr/local/... have been changed to /usr/... as
appropriate, etc.
Rob Browning [Tue, 5 Apr 2011 03:46:24 +0000 (22:46 -0500)]
Remove files that appear to be incompatible with the DFSG
Files that appear to be incompatible with the DFSG have been removed.
A number of files have been removed from this package because their
licenses are not compatible with the Debian Free Software Guidelines
(DFSG), or because it wasn't completely clear that their licenses are
compatible.
In particular, all of the files which are covered under the GFDL and
have invariant sections have been removed in accordance with this
General Resolution: http://www.debian.org/vote/2006/vote_001.
The files that have been removed, but still appear to be
distributable, have been moved to packages in Debian's non-free
section.
Author: Rob Browning <rlb@defaultvalue.org>
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: new
Rob Browning [Tue, 5 Apr 2011 03:46:22 +0000 (22:46 -0500)]
Run debian-startup and set debian-emacs-flavor.
Emacs runs debian-startup and sets debian-emacs-flavor.
* Emacs runs debian-startup during the startup process unless
site-run-file is false.
* The global variable debian-emacs-flavor is bound to 'emacs24.
Author: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 7 Apr 2013 20:03:05 +0000 (15:03 -0500)]
Prefer /usr/share/info/emacs-24 over /usr/share/info.
Emacs will prefer /usr/share/info/emacs-24 over /usr/share/info.
The value of Info-default-directory-list has been augmented via
lisp/info.el to include /usr/share/info/emacs-MAJORVERSION before
/usr/share/info.
Rob Browning [Sun, 14 Jun 2015 19:52:39 +0000 (14:52 -0500)]
record new upstream branch
Rob Browning [Sun, 14 Jun 2015 19:47:29 +0000 (14:47 -0500)]
Merge tag 'emacs-24.5' into deb/emacs24/d/sid/upstream
Conflicts:
doc/emacs/ChangeLog
doc/emacs/Makefile.in
doc/emacs/abbrevs.texi
doc/emacs/ack.texi
doc/emacs/anti.texi
doc/emacs/arevert-xtra.texi
doc/emacs/basic.texi
doc/emacs/buffers.texi
doc/emacs/building.texi
doc/emacs/cal-xtra.texi
doc/emacs/calendar.texi
doc/emacs/cmdargs.texi
doc/emacs/commands.texi
doc/emacs/custom.texi
doc/emacs/dired-xtra.texi
doc/emacs/dired.texi
doc/emacs/display.texi
doc/emacs/emacs-xtra.texi
doc/emacs/emacs.texi
doc/emacs/emerge-xtra.texi
doc/emacs/entering.texi
doc/emacs/files.texi
doc/emacs/fixit.texi
doc/emacs/fortran-xtra.texi
doc/emacs/frames.texi
doc/emacs/glossary.texi
doc/emacs/gnu.texi
doc/emacs/help.texi
doc/emacs/indent.texi
doc/emacs/killing.texi
doc/emacs/kmacro.texi
doc/emacs/m-x.texi
doc/emacs/macos.texi
doc/emacs/maintaining.texi
doc/emacs/makefile.w32-in
doc/emacs/mark.texi
doc/emacs/mini.texi
doc/emacs/misc.texi
doc/emacs/modes.texi
doc/emacs/msdog-xtra.texi
doc/emacs/msdog.texi
doc/emacs/mule.texi
doc/emacs/package.texi
doc/emacs/picture-xtra.texi
doc/emacs/programs.texi
doc/emacs/regs.texi
doc/emacs/rmail.texi
doc/emacs/screen.texi
doc/emacs/search.texi
doc/emacs/sending.texi
doc/emacs/text.texi
doc/emacs/trouble.texi
doc/emacs/vc-xtra.texi
doc/emacs/vc1-xtra.texi
doc/emacs/windows.texi
doc/emacs/xresources.texi
doc/lispintro/ChangeLog
doc/lispintro/Makefile.in
doc/lispintro/README
doc/lispintro/cons-1.eps
doc/lispintro/cons-2.eps
doc/lispintro/cons-2a.eps
doc/lispintro/cons-3.eps
doc/lispintro/cons-4.eps
doc/lispintro/cons-5.eps
doc/lispintro/drawers.eps
doc/lispintro/emacs-lisp-intro.texi
doc/lispintro/lambda-1.eps
doc/lispintro/lambda-2.eps
doc/lispintro/lambda-3.eps
doc/lispintro/makefile.w32-in
doc/lispref/ChangeLog
doc/lispref/Makefile.in
doc/lispref/README
doc/lispref/abbrevs.texi
doc/lispref/anti.texi
doc/lispref/back.texi
doc/lispref/backups.texi
doc/lispref/buffers.texi
doc/lispref/commands.texi
doc/lispref/compile.texi
doc/lispref/control.texi
doc/lispref/customize.texi
doc/lispref/debugging.texi
doc/lispref/display.texi
doc/lispref/edebug.texi
doc/lispref/elisp.texi
doc/lispref/errors.texi
doc/lispref/eval.texi
doc/lispref/files.texi
doc/lispref/frames.texi
doc/lispref/functions.texi
doc/lispref/hash.texi
doc/lispref/help.texi
doc/lispref/hooks.texi
doc/lispref/internals.texi
doc/lispref/intro.texi
doc/lispref/keymaps.texi
doc/lispref/lay-flat.texi
doc/lispref/lists.texi
doc/lispref/loading.texi
doc/lispref/macros.texi
doc/lispref/makefile.w32-in
doc/lispref/maps.texi
doc/lispref/markers.texi
doc/lispref/minibuf.texi
doc/lispref/modes.texi
doc/lispref/nonascii.texi
doc/lispref/numbers.texi
doc/lispref/objects.texi
doc/lispref/os.texi
doc/lispref/package.texi
doc/lispref/positions.texi
doc/lispref/processes.texi
doc/lispref/searching.texi
doc/lispref/sequences.texi
doc/lispref/streams.texi
doc/lispref/strings.texi
doc/lispref/symbols.texi
doc/lispref/syntax.texi
doc/lispref/text.texi
doc/lispref/tips.texi
doc/lispref/two-volume-cross-refs.txt
doc/lispref/two-volume.make
doc/lispref/variables.texi
doc/lispref/windows.texi
doc/misc/ada-mode.texi
doc/misc/auth.texi
doc/misc/autotype.texi
doc/misc/bovine.texi
doc/misc/calc.texi
doc/misc/cc-mode.texi
doc/misc/cl.texi
doc/misc/dbus.texi
doc/misc/dired-x.texi
doc/misc/ebrowse.texi
doc/misc/ede.texi
doc/misc/ediff.texi
doc/misc/edt.texi
doc/misc/eieio.texi
doc/misc/emacs-gnutls.texi
doc/misc/emacs-mime.texi
doc/misc/epa.texi
doc/misc/erc.texi
doc/misc/ert.texi
doc/misc/eshell.texi
doc/misc/eudc.texi
doc/misc/eww.texi
doc/misc/flymake.texi
doc/misc/forms.texi
doc/misc/gnus-coding.texi
doc/misc/gnus-faq.texi
doc/misc/gnus-news.texi
doc/misc/gnus.texi
doc/misc/htmlfontify.texi
doc/misc/idlwave.texi
doc/misc/ido.texi
doc/misc/info.texi
doc/misc/mairix-el.texi
doc/misc/message.texi
doc/misc/mh-e.texi
doc/misc/newsticker.texi
doc/misc/nxml-mode.texi
doc/misc/octave-mode.texi
doc/misc/org.texi
doc/misc/pcl-cvs.texi
doc/misc/pgg.texi
doc/misc/rcirc.texi
doc/misc/reftex.texi
doc/misc/remember.texi
doc/misc/sasl.texi
doc/misc/sc.texi
doc/misc/sem-user.texi
doc/misc/semantic.texi
doc/misc/ses.texi
doc/misc/sieve.texi
doc/misc/smtpmail.texi
doc/misc/speedbar.texi
doc/misc/srecode.texi
doc/misc/todo-mode.texi
doc/misc/tramp.texi
doc/misc/trampver.texi
doc/misc/url.texi
doc/misc/vip.texi
doc/misc/viper.texi
doc/misc/widget.texi
doc/misc/wisent.texi
doc/misc/woman.texi
etc/GNU
Rob Browning [Sun, 14 Jun 2015 19:05:02 +0000 (14:05 -0500)]
Adjust debian/changelog for UNRELEASED 24.5+1-1 development
Rob Browning [Sun, 14 Jun 2015 17:52:12 +0000 (12:52 -0500)]
merge deb/emacs24/d/sid/dpm-patched into deb/emacs24/d/sid/master
Migrate from the old savannah.gnu.org bzr->git mirror to the new
official git repository.
Glenn Morris [Mon, 10 Nov 2014 07:12:37 +0000 (23:12 -0800)]
Nil load-path elements shouldn't crash Emacs
This upstream patches has been added:
* lisp/startup.el (command-line): Handle nil elements in load-path.
Origin: upstream, http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=
edfdb22f674312389ccf5d5e37efa4d3f1516994
Bug-Debian: http://bugs/debian.org/768751
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Thu, 23 Oct 2014 15:24:22 +0000 (10:24 -0500)]
A race to create info/ has been eliminated
Previously something like "make -j2 info" might fail because there was
a race to create info/. This backport was adapted from the broader
patch listed below.
Origin: backport, commit: r118181,
a385f9e187ceec0610f000158305c9d5cb987dbd
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Wed, 22 Oct 2014 00:10:17 +0000 (19:10 -0500)]
Don't try to build src/macuvs.h (via IVD_Sequences.txt)
These are OS X specific, and were removed for now, due to uncertainty
over the licensing.
Rob Browning [Tue, 5 Apr 2011 03:46:29 +0000 (22:46 -0500)]
Look for NEWS in order to find etc/ rather than GNU.
Emacs will now look for NEWS in order to find etc/ rather than GNU.
Since Debian doesn't include GNU in the Debian packages (the common
licenses are in /usr/share/common-licenses), Emacs will now look for
NEWS to find the etc directory instead of GNU.
Provided-by: Sven Joachim <svenjoac@gmx.de>
Originally-reported-by: Bernhard Michler <Boregard@gmx.net>
Date: Mon, 28 Apr 2008 11:20:23 +0200
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: Debian specific
Rob Browning [Tue, 5 Apr 2011 03:46:28 +0000 (22:46 -0500)]
Modify the output of (version) to indicate Debian modifications.
The output of (version) has been modified to indicate Debian modifications.
Author: Rob Browning <rlb@defaultvalue.org>
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Tue, 5 Apr 2011 03:46:25 +0000 (22:46 -0500)]
Adjust documentation references for Debian.
Various documentation references have been adjusted for Debian.
References to /usr/local/... have been changed to /usr/... as
appropriate, etc.
Rob Browning [Tue, 5 Apr 2011 03:46:24 +0000 (22:46 -0500)]
Remove files that appear to be incompatible with the DFSG
Files that appear to be incompatible with the DFSG have been removed.
A number of files have been removed from this package because their
licenses are not compatible with the Debian Free Software Guidelines
(DFSG), or because it wasn't completely clear that their licenses are
compatible.
In particular, all of the files which are covered under the GFDL and
have invariant sections have been removed in accordance with this
General Resolution: http://www.debian.org/vote/2006/vote_001.
The files that have been removed, but still appear to be
distributable, have been moved to packages in Debian's non-free
section.
Author: Rob Browning <rlb@defaultvalue.org>
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: new
Rob Browning [Tue, 5 Apr 2011 03:46:22 +0000 (22:46 -0500)]
Run debian-startup and set debian-emacs-flavor.
Emacs runs debian-startup and sets debian-emacs-flavor.
* Emacs runs debian-startup during the startup process unless
site-run-file is false.
* The global variable debian-emacs-flavor is bound to 'emacs24.
Author: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 7 Apr 2013 20:03:05 +0000 (15:03 -0500)]
Prefer /usr/share/info/emacs-24 over /usr/share/info.
Emacs will prefer /usr/share/info/emacs-24 over /usr/share/info.
The value of Info-default-directory-list has been augmented via
lisp/info.el to include /usr/share/info/emacs-MAJORVERSION before
/usr/share/info.
Rob Browning [Sun, 14 Jun 2015 17:51:01 +0000 (12:51 -0500)]
record new upstream branch
Rob Browning [Sun, 14 Jun 2015 17:41:01 +0000 (12:41 -0500)]
Remove DFSG incompatible files
Remove files that are incompatible with the Debian Free Software
Guidelines.
Rob Browning [Sun, 14 Jun 2015 17:27:53 +0000 (12:27 -0500)]
Adjust debian/changelog for UNRELEASED 24.4+2-1 development
Nicolas Petton [Mon, 6 Apr 2015 18:20:08 +0000 (20:20 +0200)]
* lisp/ChangeLog: Remove a duplicate
Nicolas Petton [Sun, 5 Apr 2015 15:23:28 +0000 (17:23 +0200)]
lisp/ldefs-boot.el: Update for the 24.5 release
Nicolas Petton [Thu, 2 Apr 2015 07:36:15 +0000 (09:36 +0200)]
Update the 24.5 release date in all ChangeLog files
Glenn Morris [Fri, 3 Apr 2015 15:16:23 +0000 (11:16 -0400)]
* admin/make-tarball.txt: Copyedits.
Glenn Morris [Fri, 3 Apr 2015 15:11:15 +0000 (11:11 -0400)]
; ChangeLog fix
Alan Mackenzie [Fri, 3 Apr 2015 12:22:45 +0000 (12:22 +0000)]
Revert "CC Mode: Stop Font Lock forcing fontification from BOL. Bug#19669."
This reverts commit
d69e9f1c24f37f36af33b0468c5a4e100dbb09b6.
Nicolas Petton [Wed, 1 Apr 2015 20:27:47 +0000 (22:27 +0200)]
* etc/AUTHORS: Update the AUTHORS file
Michael Albinus [Wed, 1 Apr 2015 15:04:07 +0000 (17:04 +0200)]
Fix tramp-tests.el
* automated/tramp-tests.el (tramp-test06-directory-file-name):
Fix docstring and last test.
Michael Albinus [Wed, 1 Apr 2015 07:31:20 +0000 (09:31 +0200)]
Fix bug#20233, do not merge with master
* lisp/net/tramp.el (tramp-handle-unhandled-file-name-directory):
Return nil when required by the spec. (Bug#20233)
Jan D [Sun, 29 Mar 2015 19:16:23 +0000 (21:16 +0200)]
Fixes: debbugs:19175
* gtkutil.c (xg_display_open):
* xterm.c (x_display_ok, x_term_init): Block SIGIO when opening
a display.
Eli Zaretskii [Sun, 29 Mar 2015 16:41:04 +0000 (19:41 +0300)]
Fix the preamble text of the DIR file we install (Bug#20213)
build-aux/dir_top (File): Fix the description of selecting a
menu item by its number.
Eli Zaretskii [Sat, 28 Mar 2015 17:37:47 +0000 (20:37 +0300)]
src/w32proc.c: Describe in a comment w32 subprocess implementation.
Nicolas Petton [Fri, 27 Mar 2015 08:52:01 +0000 (09:52 +0100)]
Bump version to 24.5 for the release-candidate
Stefan Monnier [Thu, 26 Mar 2015 19:17:51 +0000 (15:17 -0400)]
(url-insert-file-contents): Set buffer-file-coding-system
Fixes: debbugs:20010
* lisp/url/url-handlers.el (url-insert-file-contents): Call
after-insert-file-set-coding like insert-file-contents, to set
buffer-file-coding-system. [Backport]
Stefan Monnier [Thu, 26 Mar 2015 13:36:24 +0000 (09:36 -0400)]
* smie.el (smie*ward-sexp-command): Don't pretend the arg is optional
Fixes: debbugs:20205
* lisp/emacs-lisp/smie.el (smie-backward-sexp-command)
(smie-forward-sexp-command): Don't pretend the arg is optional.
Martin Rudalics [Wed, 25 Mar 2015 10:17:30 +0000 (11:17 +0100)]
Don't round up scroll bar width with GTK3 (Bug#20182).
* gtkutil.c (update_theme_scrollbar_width): Don't round up
scroll bar width with GTK3 (Bug#20182).
Glenn Morris [Wed, 25 Mar 2015 05:42:42 +0000 (22:42 -0700)]
* doc/lispref/objects.texi (Equality Predicates): Fix typo in example.
Eli Zaretskii [Mon, 23 Mar 2015 16:39:38 +0000 (18:39 +0200)]
Another minor improvement in ELisp manual (Bug#20168)
doc/lispref/commands.texi (Accessing Mouse): More accurate description
of 'posn-object-x-y'.
Eli Zaretskii [Mon, 23 Mar 2015 16:35:03 +0000 (18:35 +0200)]
Improve docs of 'posn-actual-col-row' (Bug#20169)
doc/lispref/commands.texi (Accessing Mouse): Expand documentation of
'posn-actual-col-row'.
Eli Zaretskii [Mon, 23 Mar 2015 16:23:47 +0000 (18:23 +0200)]
Minor documentation fix in ELisp manual (Bug#20174)
doc/lispref/commands.texi (Event Input Misc): Fix incorrect usage of @code.
Stefan Monnier [Mon, 23 Mar 2015 13:12:52 +0000 (09:12 -0400)]
* display.texi (Useless Whitespace): Fix thinko.
Reported by Fabio Pesari.
Andreas Schwab [Mon, 23 Mar 2015 10:55:24 +0000 (11:55 +0100)]
* configure.ac: Fix jpeg version check to work with gcc >= 5.
Ben Bacarisse [Mon, 23 Mar 2015 08:02:01 +0000 (08:02 +0000)]
lisp/gnus/nnmh.el (nnmh-request-expire-articles): Work for the case nnmail-expiry-target is an nnmh group (bug#20170)
Glenn Morris [Mon, 23 Mar 2015 00:33:49 +0000 (17:33 -0700)]
authors.el small additions
* lisp/emacs-lisp/authors.el (authors-aliases)
(authors-obsolete-files-regexps): Additions.
Glenn Morris [Mon, 23 Mar 2015 00:10:10 +0000 (17:10 -0700)]
* etc/PROBLEMS: Add entry about dir-locals and some auto-mounters.
Jan D [Sun, 22 Mar 2015 18:31:46 +0000 (19:31 +0100)]
Fixes: debbugs:18939
* simple.el (deactivate-mark): Only modify PRIMARY if we own PRIMARY.
Glenn Morris [Sun, 22 Mar 2015 18:11:27 +0000 (11:11 -0700)]
ChangeLog fix
No need to merge to trunk, since it corrects a backported entry that
should not appear in trunk.
Martin Rudalics [Sun, 22 Mar 2015 11:40:21 +0000 (12:40 +0100)]
In `debug' don't try using window on inaccessible frame (Bug#17170).
* emacs-lisp/debug.el (debug): Don't try using "previous"
window when its not live or on an invisible frame (Bug#17170).
Jan D [Sun, 22 Mar 2015 09:21:45 +0000 (10:21 +0100)]
Backport 20156 fix (stack corruption)
Fixes: debbugs:20156
* src/fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with
+ 3 in alloca (tiny change)
Eli Zaretskii [Sat, 21 Mar 2015 10:04:39 +0000 (12:04 +0200)]
Fix lisp/ChangeLog entry from last commit.
Mario Lang [Fri, 6 Jun 2014 00:39:22 +0000 (02:39 +0200)]
Fix problems caused by calling 'recenter' in auto-revert (Bug#20122)
lisp/emacs-lisp/tabulated-list.el (tabulated-list-print): Only call
`recenter' if `current-buffer' is equal to `window-buffer'.
(cherry picked from commit
4a8160204325c4b955647fe9e0a944c1f8c705dd)
Dmitry Gutov [Fri, 20 Mar 2015 04:05:02 +0000 (06:05 +0200)]
Backport: ruby-mode: Detect regexps after `!'
Fixes: debbugs:19285
* lisp/progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Detect
regexps after `!'.
(cherry picked from commit
8854b9cf5283cac3e4a5a3726325a82b88c1fcb5)
Dmitry Gutov [Fri, 20 Mar 2015 04:04:54 +0000 (06:04 +0200)]
Backport: ruby-mode: Change faces used for self, true, false and nil
Fixes: debbugs:17733
* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Use
`font-lock-constant-face' for nil, true and false. Highlight
`self' as a keyword.
(cherry picked from commit
e991af9228af77356df1e4ce7e824d5140a3bf8a)
Nobuyoshi Nakada [Fri, 20 Mar 2015 04:04:36 +0000 (06:04 +0200)]
Backport: ruby-mode: Expect regexp after { or | too
Fixes: debbugs:20026
* progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect
beginning of regexp also after open brace or vertical bar.
(cherry picked from commit
dad0fc589c18dd95cf1ac77869a4530e2848c328)
Eli Zaretskii [Wed, 18 Mar 2015 17:32:22 +0000 (19:32 +0200)]
Fix incorrect usage of @key in the User Manual (Bug#20135)
doc/emacs/misc.texi (Term Mode):
doc/emacs/programs.texi (Basic Indent, Custom C Indent):
doc/emacs/mini.texi (Minibuffer History):
doc/emacs/text.texi (Org Mode):
doc/emacs/display.texi (View Mode): Use @kbd where @key was mistakenly
used.
Eli Zaretskii [Mon, 16 Mar 2015 18:01:38 +0000 (20:01 +0200)]
doc/misc/efaq-w32.texi: Spell-check.
Eli Zaretskii [Mon, 16 Mar 2015 17:46:45 +0000 (19:46 +0200)]
doc/misc/efaq-w32.texi: Remove outdated information and update.
Martin Rudalics [Sun, 15 Mar 2015 19:17:09 +0000 (20:17 +0100)]
Fix description of fullscreen mode on MS-Windows (Bug#20110).
* efaq.texi (Fullscreen mode on MS-Windows): Fix description (Bug#20110).
Eli Zaretskii [Sat, 14 Mar 2015 17:46:01 +0000 (19:46 +0200)]
doc/lispref/minibuf.texi (Basic Completion): Fix a typo. (Bug#20108)
Eli Zaretskii [Sat, 14 Mar 2015 17:30:36 +0000 (19:30 +0200)]
Improve indexing in Emacs manual (Bug#20105)
doc/emacs/basic.texi (Moving Point): Improve indexing for HOME and END.
doc/emacs/cmdargs.texi (General Variables): Improve indexing for
environment variables.
doc/emacs/msdog.texi (Windows HOME):
doc/emacs/msdog-xtra.texi (MS-DOS File Names): Remove markup from HOME in
the index entries.
Glenn Morris [Thu, 12 Mar 2015 15:59:56 +0000 (08:59 -0700)]
Fix --no-bitmap-icon
* src/frame.h (x_set_bitmap_icon): Don't set the icon if icon-type is
nil/not present in the parameter alist.
Fixes: debbugs:19680
Nicolas Petton [Sun, 8 Mar 2015 14:42:28 +0000 (15:42 +0100)]
Bump version to 24.4.91
Nicolas Petton [Sun, 8 Mar 2015 14:40:45 +0000 (15:40 +0100)]
* etc/AUTHORS: Update the AUTHORS file
Nicolas Petton [Sun, 8 Mar 2015 14:39:59 +0000 (15:39 +0100)]
* lisp/ChangeLog: Fix a changelog entry
Michael Albinus [Sat, 7 Mar 2015 20:02:04 +0000 (21:02 +0100)]
Make tramp-ssh-controlmaster-options a defcustom. Do not merge with
Fixes: debbugs:20015
* net/tramp.el (tramp-ssh-controlmaster-options): Make it a
defcustom.
Rob Browning [Sat, 7 Mar 2015 19:27:38 +0000 (13:27 -0600)]
Update debian/changelog for 24.4+1-5 release
Rob Browning [Sat, 7 Mar 2015 19:20:41 +0000 (13:20 -0600)]
emacs24-common: break apel (<< 10.8+0.
20120427-4)
Add "Breaks: apel (<< 10.8+0.
20120427-4)" to emacs24-common to fix a
byte-compilation problem with older versions of the package.
Thanks to Łukasz Stelmach for the report and Sébastien Villemot for
tracking down the correct version.
Closes: 775564
Rob Browning [Sun, 9 Nov 2014 18:38:09 +0000 (12:38 -0600)]
emacs24-common: conflict with obsolete gnus-bonus-el package
Thanks to Hilko Bengen for reporting the problem.
Closes: 767949
Rob Browning [Sat, 7 Mar 2015 19:08:19 +0000 (13:08 -0600)]
debian/changelog: begin 24.4+1-5
Rob Browning [Sat, 7 Mar 2015 19:06:08 +0000 (13:06 -0600)]
Update debian/changelog for 24.4+1-4.1 release
Rob Browning [Sat, 7 Mar 2015 17:37:59 +0000 (11:37 -0600)]
Don't crash when load-path elements are nil
Add 0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch to make
the relevant changes.
Thanks to Balint Reczey for the 24.4+1-4.1 NMU which included this
fix.
Closes: 768751
Glenn Morris [Mon, 10 Nov 2014 07:12:37 +0000 (23:12 -0800)]
Nil load-path elements shouldn't crash Emacs
This upstream patches has been added:
* lisp/startup.el (command-line): Handle nil elements in load-path.
Origin: upstream, http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=
edfdb22f674312389ccf5d5e37efa4d3f1516994
Bug-Debian: http://bugs/debian.org/768751
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 7 Mar 2015 17:37:15 +0000 (11:37 -0600)]
debian/changelog: begin 24.4+1-4.1
Eli Zaretskii [Sat, 7 Mar 2015 13:12:57 +0000 (15:12 +0200)]
Improve MS-Windows build instructions (Bug#19989)
nt/INSTALL: Add some more installation instructions for mingw-get
users.
Eli Zaretskii [Sat, 7 Mar 2015 09:55:58 +0000 (11:55 +0200)]
lisp/dired.el (dired-delete-file): Doc fix. (Bug#20021)
Glenn Morris [Wed, 4 Mar 2015 17:04:54 +0000 (09:04 -0800)]
# Changelog fixes (no need to merge to trunk)
Agustin Martin Domingo [Tue, 3 Mar 2015 12:12:38 +0000 (13:12 +0100)]
textmodes/ispell.el: Look for aspell .dat files also under dict-dir, as aspell does.
Originally reported as http://bugs.debian.org/765349.
Noticed when aspell has different data-dir and dict-dir.
* textmodes/ispell.el (ispell-aspell-find-dictionary): Make sure
.dat files for aspell dicts are also searched for in location
described by `ispell-aspell-dict-dir', matching aspell's dict-dir
variable.
Agustin Martin Domingo [Tue, 24 Feb 2015 18:36:30 +0000 (19:36 +0100)]
ispell.el: Extend to aspell current hunspell handling of aliases names for standard dicts.
Extend `ispell-hunspell-dictionary-equivs-alist' use to aspell, once
renamed to a more general `ispell-dicts-name2locale-equivs-alist' name.
Originally reported as http://bugs.debian.org/745613
* textmodes/ispell.el (ispell-dicts-name2locale-equivs-alist)
(ispell-hunspell-fill-dictionary-entry)
(ispell-find-hunspell-dictionaries)
(ispell-set-spellchecker-params): New generic name for
`ispell-hunspell-dictionary-equivs-alist'.
(ispell-aspell-add-aliases): Also use
`ispell-dicts-name2locale-equivs-alist' to get aspell aliases for
standard dict names.
Glenn Morris [Sun, 1 Mar 2015 12:24:12 +0000 (07:24 -0500)]
# Auto-commit of loaddefs files.
Eli Zaretskii [Sat, 28 Feb 2015 10:33:32 +0000 (12:33 +0200)]
Avoid assertion violations in Rmail due to newline cache
src/search.c (find_newline): Avoid assertion violations in
CHAR_TO_BYTE when a portion of the buffer was deleted and we look
for newlines near the end of the buffer. This happens in Rmail
hen JIT font-lock fontifies a newly displayed portion of the
buffer.
Glenn Morris [Tue, 24 Feb 2015 23:02:11 +0000 (18:02 -0500)]
browse-url-firefox: update for firefox 36's removal of -remote
Ref: https://bugzilla.mozilla.org/show_bug.cgi?id=
1080319
* lisp/net/browse-url.el (browse-url-firefox-startup-arguments):
Make obsolete.
(browse-url-firefox): Doc fix. Remove -remote.
(browse-url-firefox-sentinel): Remove function.
* etc/NEWS: Mention this.
Fixes: debbugs:19921